Some gradle build updates, no joy yet