Address book Sample app fixes