More fixes, down to 3 errors, 16 failures