Compatibility fixes to make K2 and MSP work together
Fix a small issue that prevents K2 and MSP from working together nicely.