Fix BSqlDatabase