Fixes to some extension points.