Fix loading of modules