Fixed few errors