image and deploy fixes
image and deploy fixes