More fixes. I have nothing else to say.