Gradle wrapper upgrade and minor tweaks