Correct various vailidty checks due to latest changes.