Fixes for ST3

Tested in ST2, works aswell