still more fixes