fix various inconsistencies in the deploy scripts