diff --git a/index/gn/gnoga/gnoga-2.1.2.toml b/index/gn/gnoga/gnoga-2.1.2.toml
index 0aa003df8..280d6baf6 100644
--- a/index/gn/gnoga/gnoga-2.1.2.toml
+++ b/index/gn/gnoga/gnoga-2.1.2.toml
@@ -12,16 +12,16 @@ licenses = "GPL-3.0-only WITH GCC-exception-3.1"
 
 project-files = ["lib_gnoga.gpr"]
 
-[gpr-set-externals.'case(os)']
-linux   = { Target_OS = "Linux", PRJ_TARGET = "Linux" }
-windows = { Target_OS = "Windows", PRJ_TARGET = "Windows" }
-macos   = { Target_OS = "OSX", PRJ_TARGET = "OSX" }
-
 [[depends-on]]
 gnat = ">=2021 | (>=12 & <2000)"
 simple_components = "^4.62.0"
 uxstrings = "~0.4.0+alpha-20220803"
 
+[gpr-set-externals.'case(os)']
+linux   = { PRJ_TARGET = "Linux" }
+windows = { PRJ_TARGET = "Windows" }
+macos   = { PRJ_TARGET = "OSX" }
+
 [origin]
 commit = "5f127c56986a7a1a562b405d7934eabf8e624c25"
 url = "git+https://github.com/Blady-Com/gnoga.git"
diff --git a/index/li/libgnutls/libgnutls-external.toml b/index/li/libgnutls/libgnutls-external.toml
index 34d7ea9fe..9159303d4 100644
--- a/index/li/libgnutls/libgnutls-external.toml
+++ b/index/li/libgnutls/libgnutls-external.toml
@@ -7,7 +7,9 @@ maintainers-logins = ["mosteo"]
 [[external]]
 kind = "system"
 [external.origin."case(distribution)"]
+"arch" = ["gnutls"]
 "debian|ubuntu" = ["libgnutls28-dev"]
+"centos|fedora" = ["gnutls-devel"]
 "homebrew" = ["gnutls"]
 "macports" = ["gnutls"]
 
diff --git a/index/si/simple_components/simple_components-4.68.0.toml b/index/si/simple_components/simple_components-4.68.0.toml
index 6c9ca76a2..3ed668b49 100644
--- a/index/si/simple_components/simple_components-4.68.0.toml
+++ b/index/si/simple_components/simple_components-4.68.0.toml
@@ -21,18 +21,15 @@ Target_OS = ["Windows", "Windows_NT", "Linux", "UNIX", "OSX", "FreeBSD", "auto"]
 Tasking = ["Multiple", "Single"] # Default Multiple
 Traced_Objects = ["Off", "On"] # Default Off
 
-[gpr-set-externals]
-Target_OS = "auto"
+[gpr-set-externals."case(os)"]
+freebsd = { Target_OS = "FreeBSD" }
+linux   = { Target_OS = "Linux", odbc = "unixODBC" }
+macos   = { Target_OS = "OSX" }
+windows = { Target_OS = "Windows", odbc = "ODBC32" }
 
-[gpr-set-externals."case(os)".linux]
-odbc = "unixODBC"
-[gpr-set-externals."case(os)".windows]
-odbc = "ODBC32"
-
-[gpr-set-externals."case(word-size)".bits-32]
-arch = "i686"
-[gpr-set-externals."case(word-size)".bits-64]
-arch = "x86_64"
+[gpr-set-externals."case(word-size)"]
+bits-32 = { arch = "i686" }
+bits-64 = { arch = "x86_64" }
 
 [origin]
 commit = "da9b0f3a3d56a2e60490fa5f23ca510862c252cd"
diff --git a/index/un/unixodbc/unixodbc-external.toml b/index/un/unixodbc/unixodbc-external.toml
index 67cfdf5b7..9f952b029 100644
--- a/index/un/unixodbc/unixodbc-external.toml
+++ b/index/un/unixodbc/unixodbc-external.toml
@@ -8,7 +8,9 @@ maintainers-logins = ["mosteo"]
 [[external]]
 kind = "system"
 [external.origin."case(distribution)"]
+"arch" = ["unixodbc"]
 "debian|ubuntu" = ["unixodbc-dev"]
+"centos|fedora" = ["unixODBC-devel"]
 "homebrew" = ["unixodbc"]
 "macports" = ["unixodbc"]