Minor validation additions