Fix for client.conf changes