Made a lot of MEF stuff work