Updated build.gradle + minor fix