More deploy fixes
More deploy fixes