GPII-154: Fixes according to the code review feedback.