Small updates to configuration autodetection