Fix compile issues after switching to mkernel OC setup
prepare to tweak mpdecision for compatibility