Issue #2335645 by slashrsm: Few minor fixes.