Fix some minor things reported by validator