Minor changes for ST3