Fix some mailman issues

Change-Id: Iefcd82ac44844993993f678896c73034fd37aa90