fix errors which were found by validator