And...two more potentially duplicate symbols fixed