Fixes to work with new core module loading