Some small extension upgrades