Typo, and rendering metadata check
Merge fix