loader fixes