More fixes from kadu and kopete