[2108] Fix several extension point allocations