Merge fixes from ellert-globus_6_branch