Some bugs in msstitch removed