Some minor style and code fixes.