JClouds integration + Several fixes