Some small fixes to pre-rendering.
Fork me on GitHub.