Deploy script fixes#2