More fixes from Emoticone11