Fix addresses comments