Various updates following pyramid.