Tweaks to extension points