Fix more of the SQL metadata