Small validator changes