Fixing some refactoring artifacts