Add fixes in deployment scripts

Change-Id: I8c0b62fdf038404365e155c0da8388be40576c35