Deploy script fixes