Partial fix of MS edits