Bug fixes in DiTrigrams