Fixes for menu integration