fix validation issues, part 2