Some fixes for watches which send updates even when there's no steps being taken.