Small Bugfixes