More validation improvements