Make previous change pass some tests