Fixed smiley issues