Fix a couple of bugs waiting on record sub-elements