Further rendering optimizations