Missed a gradle update and a few comments in build files