Production deploy fixes