msc fixes / changes