Several Compatibility- and Bugfixes