Bugfixes
Merge