Update build.gradle as per PR comments