Inconsistent menu updates

Other MSC issues: