DB/SAI: some fixes for The Art of Being a Water Terror

Closes #9870