loading fixes