Fixing missing versions + globale key list