bugfixes in right click menus