Fixed few bugs
...