Allow dbal 2.5 & clean up slightly