Improvements to gradle build