Fixed the validation issues that I could