fixes to 360 watch