A couple of menu fixes - thanks to Gerhard Suttner for bug reports.