Fix guardian contacts and addresses