Batch fixes

Contains fixes for #171 & #172
Same as above: this assertion is useless since the returned map has a size of two and keys 1 & 2 are asserted.