Fixes in TableManager