Some contact tweaks