final deploy issues fixedg