Fix manip3 & matchbloc