Gradle fixes

A couple of minor gradle changes.