Fix startup ordering