fixes for ST3