a couple of fixes around d-fx