Various fixes.

Not.