Various rendering tweaks