Merge Bugfixes