Minor works on batch performance