Fixes of reading tables