Bring chdir up to spec
Make sure we don't lose failures