Make shrinkwrap and freeze optional