Minor fix for SQL schema and data