Improved check-*-availability.sh scripts