Some build.gradle improvements