Fix global references in CreateFromTable process flow