Better handling of internal paths