Comfort fixes