More adjustments to test standalone startup