Last of the minor fixes.