cyclades: Minor fixes