Fix build.gradle and some files