Bugfix for missing key normalization and capabilities container.