Writers refactoring fixes