Bugfixes from merging to last origin/master