Build.gradle modifications for compatibility