Fix unresolved imports