More fixes to mailman migration