Fixed some refactoring bugs