expand_path fixes.