Fix leash interaction bugs