Prevent several menu bugs