Ips bpf v1.1

Hello,

Here's an amended PR fixing the points discussed previously. It features two additional patches. First one is a cleaning and second one is the fix of a problem I've seen during my test. It is a bit unrelated but as it is really small I've pushed it here.