Fixed some issues with shrinkwrapping