Final fixes for the deploy script