thermal more fixes