Review and small miscellaneous fixes.