Further Bugfixes