Fixing some validation errors

Other validation issues appear to come from profiling issues that may
have existed before but were not caught because there were no cross
references to cause validation issues. These need further investigation.