Fix broken / missing keys