I've heard that with Halsin specifically, you can travel between areas to fix him.
No word on a fix for any other companions yet though.