Fix for allowing override of connection config