structure loader fixes