Port previous changes to plot-ll-mapimage.py