Fixing more ByteBuf leaks