More fixes to forward headers.