Prep for upstream packages