ScenarioModule loading fixes from trafalg
Fixes #579