Partially fix key associations