More rendering tweaks.