cyclades: Various small fixes