Handle path names properly