Minor changes for move to DFL