more contact fixes