Fix reported errors