Fix refactorization errors.