Further deploy script changes