Important Bugfixes