Minor changes before first pretest