Changes to pass validation with fewer warnings