BUG: Various tubeObject and tubeMacro fixes

Change-Id: I83c61b72a762c5bb78e1d4f837af01841ec99441