Refactoring fixes, caught out by cache...