Fixes to pass validation