final deploy fixes