DB : Some fixes