Fixes for SVG support.