mscfb fixes