Fixing some problems with loading