Fix refactorings