Fix up key "import" logic