More shippable debugging