Some refinements to the loader