More refactoring fixes.... again.