Adjustments needed for pureQuickstart mode.