review fixes Bug 1010729