More misc. power+thermal fixes