Fixed some connection issues for local/prod
Fixed some connection issues for local/prod