Fixes after some more inline layer 3 testing