dmfe: fix two bugs