Fixes for ST2.