A couple small Gradle fixes for 4.5.3 release.