Fixed up ST3 issues