small fixes to pass validation