by slashrsm: Few minor fixes.
by slashrsm: Code-in.