Bath Time and SVG fixes