Goof and code review changes.