by slashrsm: Few minor fixes.