Minor adjustments to some extensions.