tweaks to support Gradle