Fix overflowing tables