ThermalD Fixes