Small Bugfixing