Fixed watch differences between platforms