various ST3 fixes