Tweaked thermal values some more