Fixed few problems