Fixed a few more failures when there is no config file.