Fix MPMC issues