Issue #2376683 by slashrsm: Fix minor stuff.