Small rendering and cleanup fixes.