Small Bugfixes
merge