Minor fixes to Empathy