Fix MFFS infinite loop + CMEs

Signed-off-by: Ross Allan <rallanpcl@gmail.com>