Various updates to facilitate validating things.