More fixes.

Not sure what is going on :(