Fixes refactorings