Tweak sed commands some more