[mfc] small bugfixes for MFC5