Various Bugfixes