Merge "Table schema fixes"