Misc validation improvements