More trinary errors fixed