couple of loading fixes from the merge