some loader fixes