Better handling of constructing our PATH