Multiple Bugfixes