Minor rendering enhancements