Fixing some issues with loading