import fixes for windows