Fixed handling of relative paths