Fix: Bad menu def
Merge pull request #610 from FHenry/3.3

Remove bad retrun parameters
Merge pull request #613 from FHenry/3.3

Fix bug 692, 681