Fixing more problems with refactoring stuff.