Fixed module loading procedures