Updates to gradle build