more fixes (tests still failing)