Improve support of corrupt tables