DB/Updates: AI fixups

By @Aokromes, fixes #10733 #10728