Fixed some issue caught by validator