Minor changes before merge...