NX-485: minor improvements to startup ordering