Some fixes in passing the address info