Completed code review fixes.