Fix header references
Correct data type for encoder body