Fixed some refactoring messups