Different Bugfixes