Fix MBR, EM1, EM2 update logic