Fixed a few problems with loading