tweaks and fixes for cloud-tm demo