Fixed ordering of children moving in composite.

Workbench startup is now NPE free.