-yet more fixes