Fix Porter overwriting structure-required columns using strings in the mapping