Fixed an issue where recreateDelegate where the template was looking
into aliases this as well.

Also replaced wait with join at root simulator level.