mbp fixes and import redirects module