cgnet fixes