Merge "Fix table schema"