FIX EDGE CONNECTION ISSUES