More tweaks for shippable.