Fixed a few small things after sensible comments from Hoikas.