Fix nested keys