Few errors fixed