Minor changes to main before merge.