JCLOUDS-69/JCLOUDS-68 Fixing

Fixing JCLOUDS-69 and JCLOUDS-68