small fixes to loading definitions