fixes to Loader