api loader fixes