Meh.
Some fixes.