Minor fixes to make the main menu work.