Fixed index references to modules.
14 files changed