A couple of config improvements.