yet more fixes