Improve handling of SVG