Fixes around standardizing extensions API