Fixed UniType bugs