bug 803209 - code review fixes