Contact fixes