Adjust to more server changes with trailers
3.0.216