Delivery mission. Flow fixes