Gradle and attempt at fixes