cyclades: Small fixes for release-0.16