various fixes to delegate network