Updates to fix compile messages in preparation for NSF-funded work.