Fix some menu API oddities.