Fix for missing defer headers.