Some MFFS updates