fixing usages of keys