Minor changes to module loader .et al