Minor changes according to code review comments.