More VCard fixes