Code review, minor fixes.