few fixes in batch check