More minor fixes. Mostly menus are broken