More robust startup