Minor changes before merge