Fix expand_path