Fixed some more richtext issues