A couple bug fixes, updated config-file-provider.