FIx table problems