SHDP-186 SHDP-188 Fixing some batch problems