Changed usage of expand_path