Changed: fixed some missing refactorings