Fix-SQL-Issues