misc fixes (master branch)

Enrico Weigeltrequested to merge
metux/xfwm4:submit/bugfixes-master into master

misc fixes (against master branch)

Merge request reports