Fixes and timeouts

I've confirmed that sed on OS X supports arguments as they are provided after this patch is applied.