Fix L2-only traffic for V4
Some cleanup