Adapted to latest Dysco plus some other small fixes