Fixed issues with table structure.