Shrinkwrap consistency

cc @jcorbin @sh1mmer