Final build.gradle changes