a couple of fixes to get get_record_set working more like one would expect