Fix all the contact stuff