More DBsql edits