fix xx2ST macros