a few fixes to address either spec compliance or cases where passed values aren't necessarily the "right" values