Key exchange fixes
Problem with decentralizing fixes