Re #1480: couple corrections of field names