Fix some issues with rendering.