Issue #2376691 by slashrsm: Fix few minor things.