Fixes to work with SVG files