Few minor fixes for MSC 1.x branch