Fix for configuration, keystore name and clients tree