Fix key management needing a SID