TH fixes for embedded