Tweak how shell wrappers are built