FIXING STUFF DUE TO PREVIOUS MSW COMPATIBILITY CHANGES