SVG fixes, weak refs, for wae