Various fixes before delivery.