Attempt to fix Gradle issues