Fixed success flags being too high up