more validaotr fixes