Fix quality flaws.

Change fix done in commit 80470a1cd330e123022091e2de8204b489d49ccf