More Bugfixing