Batcher: fix immediate build errors; see #19