Fixing some stuff with network<-->controller --CJB