Additional Bugfixes