Fixes for ST3 compatibility