Fixed various elements to pass validation