Fixes to get build working (tests still failing)
Fixes to get build working (tests still failing)

Signed-off-by: Greg Watson <448ba9447fd8df3878bc76ca564ae1ab3c3adb4d@computer.org>
SmithRWORNL/january,SmithRWORNL/january,yannick-mayeur/january,IanMayo/january,SmithRWORNL/january,IanMayo/january,yannick-mayeur/january,IanMayo/january,yannick-mayeur/january,IanMayo/january,yannick-mayeur/january