Fixes to allow global devices to be used for complex devices