Minor deploy improvements