Fixes for ST3