few loading fixes