Fix issues with watches