Fix bugs due to MPB addition