Several fixes for DragonFly