Fix up some things on batch