Fixes for special menus
#45