Fix typo and invalid keys name