Additional doc-specific fixes