Improve handling of Gradle properties