Fixed module definitions and load references.