Change default value for cwd to None