Fixed more porting issues to MSC