Fix Loading Issues