Issue LIBCLOUD-353: changes as per review remarks