More tweaks to try to get shippable working.