Fix some of the validation - more attention needed here