Fixes for the load-cfg option.