Contact minor fixes