Fix up new source creation flow.