Fixed some import errors on Windows with ST2