Applied fixes.

Not bad.