Port fixes in st2 to st3