DBAL fixes