Fix some menu annoyments