Fix Loading Bugs