Tiny fixes.
More minor fixes.