Fix tables even more