Fixed some address book issues