Various corrections in build.gradle