2014 fix and Gradle migration