Intermediate changes.

Fix startup sequence