Fix some imports for ST3.