Issue #2350029 by slashrsm: Minor fixes.