Fix imports for previous commit