Tidy and tools fixes
Gradle did stuff