fixes in tekeya