Fix menu command bugs