Fixed import errors from last commit