More M4->M5 fixes