Bug 988740 - code review fixes