more fixes for mrfy