Some fixes
Small fixes
Merge remote-tracking branch 'stefan/master' into devel