More preseed fixes