Bug 916793 - review fixes
more comments