Fixes some little bugs in empathy.