Some fixes for waxe menus