Treatment fixes