Some fixes
Merge branch 'master' into gui
Remove comment