Fixes for missing menu