Better handling of VS file path