Attempt at build.gradle fix and fluid updates