fixing two issues Max found

--HG--
extra : source : 22fefaa0a475a099671335825e22c3464f5d9147
Merging master into noframes
menu fixes.  menus now fully work as far as I can tell