Hopefully fixed Gradle issues