Some Bugfixing