Fixed Some Loading Issues