dpm build fixes