More Bugfixes