Global scope fixes, mc file shown