New version of Gradle borked the build. Necessary changed made
Grade Bork cleanup