[mfc] fixed some regressions from the previous refactoring