Fix offsets and continue factorization