Fixes to gradle build file