Zat Validate fixes