even more compatibility & fixes for broken tests!