Fix some issues during contacts import