more fixes. :/