Fix for top-level units and slots.
SITEWHERE-41