sm 2.2-6.0
Minor bug fixes.