Validation fixes: part 1