Minor changes to main