Some rendering fixes.