Fixing imports for build failure