Little fixes, but tests still fail