Minor optimizations and SVG renderer support