Round 3 of shellshock updates

Round 3 ding!