[contact] Several individually small changes.