Fixing proxy issue and cross-endpoint configuration clashing