More SDRRBFNetwork fixes