Fixing key-errors.