Fixing up imports for ST2/3