Codestyle fixes.

And some other fixes.