Various modifications and fixes are needed for the delivery scripts. This issue is taking care of it...