Fixed Gradle(w) build and Travis errors