Round 1 of fixes for failing tests (actually by Eberhard)