Fix headers for thar and embed