More CloudFoundry startup changes