Added fixes for a couple of other places where remote_addr was used.