Multiple fixes for SVG mask support