Some docx fixes – not functional yet