You could also try back flushing the heater core.