FIXED: Various edge cases in the loader that may cause stalling progress at 0%