Added minor things for crate unboxing.