VCard fixes, minor