Update for upstream changes
Fix trailer line formatting