*: fix canonical addresses.