[CLC-1198] More attempts to get sqlite to behave nicely