Tweak extensions

By Peterpan

bench: 4485824