Optimize rendering - tiny fixes