Some fixes in deploy and cyclades