Fixing some missing refactoring