Minor simplification of a few queries
Updated dep versions
Make the scripts a bit friendlier for mal-configed systems