Fixing issues found with new menus class.