Fix mentions/services