Fixes to ensure watch version is legitimately sent (e.g. Android is slow on the JS uptake)