improve build property discovery/fallback