added fixes for commit batch errors