Fixed few mistakes