Fix up compile and gradle issues, also working on
DPH update