Several fixes in contacts