Tweaks to go with recent refactoring of Core module - compiles and tests OK but still doesn't run (sandboxing issue)