Correct extension point handling
44 files changed