Some fixes

DG