Fix broken menu handlers