Fix minor merge issues from NBIA 6.0 found on review with a different comparison tool.