Code review corrections.