Reported errors fixed