minor changes to pass validation