Batch refresh bug fixes