Minor changes before merging master.