Merge PR#45: Preseed fixes