mpsGeneric fixes