Adjustments to netlink code