Small changes needed so *all* checks (with test_level = 2 !) run