by slashrsm: Final fixes.