More shellshock tweaks