more fixes for Nitrogen migration
more fixes for Nitrogen migration