Better handling of relative paths