Fix AWS system auto-discovery and auto-configuration.