Fixes to make it work with ST3