More fixes for FEDLIST