t1_contact: some fixes after merge