small fixes to named tuple choices