Minor fixes to support Intermediate_Globe example