Fixes for SVG Export

Fixes for SVG Export