Fixed config files and keys