Fixed failed refactorings