Fixing admin issues due to socket upgrade

Don't merge yet