Fixed urgent import errors