Add Typesafe headers where missing