Temperature-mode fixes