Better support for os/host-based configs