Thanks. The first two chunks seem right, but not the last one. Applied as: https://git.zx2c4.com/wireguard-tools/commit/?id=95aa00b8846396273a4ece75de7701d11516e050