More current working directory fixing