Fixed more warnings.

It's ugly though.