Dumb changes to batch plotting code