More loading fixes