Misc extensions for Empathy