A couple of adjustments for following, etc