Make sure we use the proper address when querying peers table
Minor nits