Fixed errors found by validator