Changes to get NDDesiderata to compile.
Fixed conflicts.