Fix block uploader restore validation and BatchForget error handling
