Various updates for Gradle...