Fixed few more errors