More fixes to gfrn