More same src/dst ip fixes