some fixes in gradle-setup