Fix config file name resolution
Restore CVS key