Bugfixes and Improvements for 2.4