Infinite phase inc fix, phase 5 fixes