ST3 compatibility fixes