Fixed few bugs
Fixed few bugs