Little changes to gradle-common