Couple of post deploy fixes