Minor bugs
Merge branch 'kemal-dev' into develop