Minor changes to Main