Fix two errors related to address books.