Made some more improvements to pass validation.