Bug fixes for address