Prepare for upstream