Fixes to render correctly.