toku fixes