Fixes for the Nitrogen migration