Fixed a couple of refactoring errors.