Loader fixes