Updates to the update-images.py script and utilities