Code Kit fixes - AdressBook