Now compiles again; some tests fail