more loader fixes