Added validation fixes throughout.