Reorder initial operations to fix first run