Fixed DFP build