Fix imports for SPEC