More robust deploy