MS - Repair several details.