Fixes for contact matching