Finish some of the gradle stuff