Bug fixes for menu changes and various fixes to make the extensions compatible with RC3