Address list fixes