Minor rendering improvements