Fixes to pass validation
Merge branch 'dev' into beta