Final tweaks to ScanLoader/CoreLoader

Should be ok now.