More fixes

I think that is all.