Fix a few menu issues.