try some more fixes