Couple of fixes for Gradle (Will I ever get it right)