tbls fixes