Fix up Extension